hvmloader: Fix acpi static tables for new ACPI ioports location.

This change some fadt values -- the address of the acpi ioports -- and
the pm1a_evt_address value wrote for the pci bus.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>

diff --git a/tools/firmware/hvmloader/acpi/static_tables.c b/tools/firmware/hvmloader/acpi/static_tables.c
index c2635617cfece92f3eb2f685b969fe051d11bd3d..cf4b8dc82535366bd64c1db260ded425edbc888c 100644 (file)
--- a/tools/firmware/hvmloader/acpi/static_tables.c
+++ b/tools/firmware/hvmloader/acpi/static_tables.c
@@ -56,14 +56,14 @@ struct acpi_20_fadt Fadt = {
 
     .sci_int = 9,
 
-    .pm1a_evt_blk = ACPI_PM1A_EVT_BLK_ADDRESS,
-    .pm1a_cnt_blk = ACPI_PM1A_CNT_BLK_ADDRESS,
-    .pm_tmr_blk = ACPI_PM_TMR_BLK_ADDRESS,
-    .gpe0_blk = ACPI_GPE0_BLK_ADDRESS,
+    .pm1a_evt_blk = ACPI_PM1A_EVT_BLK_ADDRESS_V1,
+    .pm1a_cnt_blk = ACPI_PM1A_CNT_BLK_ADDRESS_V1,
+    .pm_tmr_blk = ACPI_PM_TMR_BLK_ADDRESS_V1,
+    .gpe0_blk = ACPI_GPE0_BLK_ADDRESS_V1,
     .pm1_evt_len = ACPI_PM1A_EVT_BLK_BIT_WIDTH / 8,
     .pm1_cnt_len = ACPI_PM1A_CNT_BLK_BIT_WIDTH / 8,
     .pm_tmr_len = ACPI_PM_TMR_BLK_BIT_WIDTH / 8,
-    .gpe0_blk_len = ACPI_GPE0_BLK_LEN,
+    .gpe0_blk_len = ACPI_GPE0_BLK_LEN_V1,
 
     .p_lvl2_lat = 0x0fff, /* >100,  means we do not support C2 state */
     .p_lvl3_lat = 0x0fff, /* >1000, means we do not support C3 state */
@@ -85,21 +85,21 @@ struct acpi_20_fadt Fadt = {
         .address_space_id    = ACPI_SYSTEM_IO,
         .register_bit_width  = ACPI_PM1A_EVT_BLK_BIT_WIDTH,
         .register_bit_offset = ACPI_PM1A_EVT_BLK_BIT_OFFSET,
-        .address             = ACPI_PM1A_EVT_BLK_ADDRESS,
+        .address             = ACPI_PM1A_EVT_BLK_ADDRESS_V1,
     },
 
     .x_pm1a_cnt_blk = {
         .address_space_id    = ACPI_SYSTEM_IO,
         .register_bit_width  = ACPI_PM1A_CNT_BLK_BIT_WIDTH,
         .register_bit_offset = ACPI_PM1A_CNT_BLK_BIT_OFFSET,
-        .address             = ACPI_PM1A_CNT_BLK_ADDRESS,
+        .address             = ACPI_PM1A_CNT_BLK_ADDRESS_V1,
     },
 
     .x_pm_tmr_blk = {
         .address_space_id    = ACPI_SYSTEM_IO,
         .register_bit_width  = ACPI_PM_TMR_BLK_BIT_WIDTH,
         .register_bit_offset = ACPI_PM_TMR_BLK_BIT_OFFSET,
-        .address             = ACPI_PM_TMR_BLK_ADDRESS,
+        .address             = ACPI_PM_TMR_BLK_ADDRESS_V1,
     }
 };
 

diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index 11c78ba1d651baf797f00c8fcf91143ad7f2981c..d6717edb2b605438213a1c665aa709e88ba05998 100644 (file)
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -227,7 +227,7 @@ static void pci_setup(void)
             pci_writew(devfn, 0x22, 0x0000);
             pci_writew(devfn, 0x3c, 0x0009); /* Hardcoded IRQ9 */
             pci_writew(devfn, 0x3d, 0x0001);
-            pci_writel(devfn, 0x40, ACPI_PM1A_EVT_BLK_ADDRESS | 1);
+            pci_writel(devfn, 0x40, ACPI_PM1A_EVT_BLK_ADDRESS_V1 | 1);
             pci_writeb(devfn, 0x80, 0x01); /* enable PM io space */
             break;
         case 0x0101: